From 3c8e60e7f196e757568d0789593bb145e2002b55 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 3 Mar 2004 17:08:54 +0000 Subject: [PATCH] Set the label widget's state to prelight if we're prelit. Fixes bug 2004-03-03 Mark McLoughlin * gtk/gtkexpander.c: (gtk_expander_enter_notify), (gtk_expander_leave_notify), (gtk_expander_set_label_widget): Set the label widget's state to prelight if we're prelit. Fixes bug #136078. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkexpander.c | 17 ++++++++++++++++- 6 files changed, 51 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a392411919..c29e19893e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-03-03 Mark McLoughlin + + * gtk/gtkexpander.c: + (gtk_expander_enter_notify), (gtk_expander_leave_notify), + (gtk_expander_set_label_widget): Set the label widget's + state to prelight if we're prelit. Fixes bug #136078. + 2004-03-03 Murray Cumming * gtk/gtkradiobutton.h, radiomenuitem.h: Corrected the group_changed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a392411919..c29e19893e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-03-03 Mark McLoughlin + + * gtk/gtkexpander.c: + (gtk_expander_enter_notify), (gtk_expander_leave_notify), + (gtk_expander_set_label_widget): Set the label widget's + state to prelight if we're prelit. Fixes bug #136078. + 2004-03-03 Murray Cumming * gtk/gtkradiobutton.h, radiomenuitem.h: Corrected the group_changed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a392411919..c29e19893e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2004-03-03 Mark McLoughlin + + * gtk/gtkexpander.c: + (gtk_expander_enter_notify), (gtk_expander_leave_notify), + (gtk_expander_set_label_widget): Set the label widget's + state to prelight if we're prelit. Fixes bug #136078. + 2004-03-03 Murray Cumming * gtk/gtkradiobutton.h, radiomenuitem.h: Corrected the group_changed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a392411919..c29e19893e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-03-03 Mark McLoughlin + + * gtk/gtkexpander.c: + (gtk_expander_enter_notify), (gtk_expander_leave_notify), + (gtk_expander_set_label_widget): Set the label widget's + state to prelight if we're prelit. Fixes bug #136078. + 2004-03-03 Murray Cumming * gtk/gtkradiobutton.h, radiomenuitem.h: Corrected the group_changed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a392411919..c29e19893e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-03-03 Mark McLoughlin + + * gtk/gtkexpander.c: + (gtk_expander_enter_notify), (gtk_expander_leave_notify), + (gtk_expander_set_label_widget): Set the label widget's + state to prelight if we're prelit. Fixes bug #136078. + 2004-03-03 Murray Cumming * gtk/gtkradiobutton.h, radiomenuitem.h: Corrected the group_changed diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 780f30504f..4dfa1ba86e 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -930,6 +930,10 @@ gtk_expander_enter_notify (GtkWidget *widget, event->detail != GDK_NOTIFY_INFERIOR) { expander->priv->prelight = TRUE; + + if (expander->priv->label_widget) + gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_PRELIGHT); + gtk_expander_redraw_expander (expander); } @@ -949,6 +953,10 @@ gtk_expander_leave_notify (GtkWidget *widget, event->detail != GDK_NOTIFY_INFERIOR) { expander->priv->prelight = FALSE; + + if (expander->priv->label_widget) + gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_NORMAL); + gtk_expander_redraw_expander (expander); } @@ -1579,14 +1587,21 @@ gtk_expander_set_label_widget (GtkExpander *expander, return; if (priv->label_widget) - gtk_widget_unparent (priv->label_widget); + { + gtk_widget_set_state (priv->label_widget, GTK_STATE_NORMAL); + gtk_widget_unparent (priv->label_widget); + } priv->label_widget = label_widget; if (label_widget) { priv->label_widget = label_widget; + gtk_widget_set_parent (label_widget, GTK_WIDGET (expander)); + + if (priv->prelight) + gtk_widget_set_state (label_widget, GTK_STATE_PRELIGHT); } if (GTK_WIDGET_VISIBLE (expander)) -- 2.30.2